Adjust gdb reader duration handling (#595)

* experiment with filtering gdb waypoints.

* formalize new gdb option to avoid creation of waypoints
from non-user points.

Also, don't fill in the description when processing durations.  This
interacted undesirably with the roadbook option.

* fix reference files.

* simplify bool option processing in gdb, new ref files.

* fix reference files again.

* contrast the gdb dropwpt option with the via option

diff --git a/gdb.cc b/gdb.cc
index 03423004270ef56e858c85d415c46b0efd6baa57..c8a3314218623037dbeac0e735fcd4578d1d10da 100644 (file)
--- a/gdb.cc
+++ b/gdb.cc
@@ -85,7 +85,10 @@
 static char gdb_release_date[] = "$Date: 2011-04-14 01:30:01 $";
 
 static gbfile* fin, *fout, *ftmp;
-static int gdb_ver, gdb_category, gdb_via, gdb_roadbook;
+static int gdb_ver, gdb_category;
+static bool gdb_roadbook;
+static bool gdb_hide_wpt;
+static bool gdb_hide_rpt;
 
 static QList<Waypoint*> wayptq_in, wayptq_out, wayptq_in_hidden;
 static short_handle short_h;
@@ -95,6 +98,7 @@ static char* gdb_opt_ver;
 static char* gdb_opt_via;
 static char* gdb_opt_roadbook;
 static char* gdb_opt_bitcategory;
+static char* gdb_opt_drop_hidden_wpt;
 
 static int waypt_flag;
 static int route_flag;
@@ -295,7 +299,7 @@ gdb_add_route_waypt(route_head* rte, Waypoint* ref, const int wpt_class)
   }
   Waypoint* res = nullptr;
   int turn_point = (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && !tmp->description.isEmpty());
-  if (turn_point || (gdb_via == 0) || (wpt_class < gt_waypt_class_map_point)) {
+  if (turn_point || !gdb_hide_rpt || (wpt_class < gt_waypt_class_map_point)) {
     res = new Waypoint(*tmp);
     route_add_wpt(rte, res);
   }
@@ -597,9 +601,6 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
     res->description = FREAD_CSTR_AS_QSTR;     /* instruction */
     if (wpt_class == gt_waypt_class_map_intersection || wpt_class == gt_waypt_class_map_line) {
       garmin_fs_t::set_duration(gmsd, duration);
-      if (res->description.isEmpty()) {  //
-        res->description = res->shortname;
-      }
       res->notes = QString("[%1]").arg(gdb_to_ISO8601_duration(duration));
 #if GDB_DEBUG
       DBG(GDB_DBG_WPTe, 1)
@@ -1000,11 +1001,11 @@ gdb_rd_init(const QString& fname)
   wayptq_in.clear();
   wayptq_in_hidden.clear();
 
-  gdb_via = (gdb_opt_via && *gdb_opt_via) ? atoi(gdb_opt_via) : 0;
-  gdb_roadbook = (gdb_opt_roadbook && *gdb_opt_roadbook) ? atoi(gdb_opt_roadbook) : 0;
-  if (gdb_roadbook) { /* higher priority */
-    gdb_via = 1;
-  }
+  bool via = gdb_opt_via;
+  bool drop_wpt = gdb_opt_drop_hidden_wpt;
+  gdb_roadbook = gdb_opt_roadbook;
+  gdb_hide_wpt = via || drop_wpt || gdb_roadbook;
+  gdb_hide_rpt = via || gdb_roadbook;
 
   waypt_ct = 0;
   waypth_ct = 0;
@@ -1057,7 +1058,7 @@ read_data()
     switch (typ) {
     case 'W':
       wpt = read_waypoint(&wpt_class);
-      if ((gdb_via == 0) || (wpt_class == 0)) {
+      if (!gdb_hide_wpt || (wpt_class == 0)) {
         waypt_add(wpt);
         auto* dupe = new Waypoint(*wpt);
         wayptq_in.append(dupe);
@@ -1805,34 +1806,33 @@ write_data()
 
 /*******************************************************************************/
 
-#define GDB_OPT_VER            "ver"
-#define GDB_OPT_VIA            "via"
-#define GDB_OPT_CATEGORY       "cat"
-#define GDB_OPT_BITCATEGORY    "bitscategory"
-#define GDB_OPT_ROADBOOK       "roadbook"
-
 static QVector<arglist_t> gdb_args = {
   {
-    GDB_OPT_CATEGORY, &gdb_opt_category,
+    "cat", &gdb_opt_category,
     "Default category on output (1..16)",
     nullptr, ARGTYPE_INT, "1", "16", nullptr
   },
   {
-    GDB_OPT_BITCATEGORY, &gdb_opt_bitcategory, "Bitmap of categories",
+    "bitscategory", &gdb_opt_bitcategory, "Bitmap of categories",
     nullptr, ARGTYPE_INT, "1", "65535", nullptr
   },
   {
-    GDB_OPT_VER, &gdb_opt_ver,
+    "ver", &gdb_opt_ver,
     "Version of gdb file to generate (1..3)",
     "2", ARGTYPE_INT, "1", "3", nullptr
   },
   {
-    GDB_OPT_VIA, &gdb_opt_via,
+    "via", &gdb_opt_via,
     "Drop route points that do not have an equivalent waypoint (hidden points)",
     nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
-    GDB_OPT_ROADBOOK, &gdb_opt_roadbook,
+    "dropwpt", &gdb_opt_drop_hidden_wpt,
+    "Don't create waypoints for non-user points",
+    nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
+  },
+  {
+    "roadbook", &gdb_opt_roadbook,
     "Include major turn points (with description) from calculated route",
     nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },

diff --git a/gpx.cc b/gpx.cc
index cd705917759dd897d69768d5ce1d024ebb378ddc..2fc109fffacfbeafab3352d4c08baf615549d20a 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -1621,11 +1621,7 @@ GpxFormat::write()
 
   gpx_reset_short_handle();
   auto gpx_waypt_pr_lambda = [this](const Waypoint* waypointp)->void {
-       auto* gmsd = garmin_fs_t::find(waypointp); /* gARmIN sPECIAL dATA */
-       auto wc = garmin_fs_t::get_wpt_class(gmsd, 0);
-       if (wc != gt_waypt_class_map_intersection && wc != gt_waypt_class_map_line) {
-               gpx_waypt_pr(waypointp);
-       }
+    gpx_waypt_pr(waypointp);
   };
   waypt_disp_all(gpx_waypt_pr_lambda);
   gpx_reset_short_handle();

diff --git a/reference/format3.txt b/reference/format3.txt
index 937f29a12c3f6797bceba716d175b68421c7b1da..643a1c7a39ef77cb10485f9b4bcee71f78808d43 100644 (file)
--- a/reference/format3.txt
+++ b/reference/format3.txt
@@ -360,6 +360,8 @@ option      gdb     ver     Version of gdb file to generate (1..3)  integer 2       1       3       https://www.
 
 option gdb     via     Drop route points that do not have an equivalent waypoint (hidden points)       boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_via
 
+option gdb     dropwpt Don't create waypoints for non-user points      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_dropwpt
+
 option gdb     roadbook        Include major turn points (with description) from calculated route      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_roadbook
 
 file   rwrwrw  garmin_txt      txt     Garmin MapSource - txt (tab delimited)  garmin_txt

diff --git a/reference/gdb-sample-v3-autoroute.gdb b/reference/gdb-sample-v3-autoroute.gdb
index 01764df71e40e45b3cf270a8cf401a56d2caf289..b7dddddbd671f50fc65ffbc2bb33ffa32a625795 100644 (file)
Binary files a/reference/gdb-sample-v3-autoroute.gdb and b/reference/gdb-sample-v3-autoroute.gdb differ

diff --git a/reference/gdb-sample-v3-autoroute.gpx b/reference/gdb-sample-v3-autoroute.gpx
index c5310a076049602ff4db2c5aac2f46226cb00120..3fc6f9622b29ff3dabdaf7969685a73ba395eb90 100644 (file)
--- a/reference/gdb-sample-v3-autoroute.gpx
+++ b/reference/gdb-sample-v3-autoroute.gpx
@@ -1,80 +1,314 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gpx version="1.0" creator="GPSBabel - https://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/0">
   <time>1970-01-01T00:00:00Z</time>
-  <bounds minlat="44.521450996" minlon="-68.208982944" maxlat="44.522766536" maxlon="-68.204090595"/>
-  <wpt lat="44.522766536" lon="-68.208928127">
-    <time>2020-05-22T12:02:08Z</time>
-    <name>7 Manor Ln</name>
-    <cmt>7 Manor Ln
-Sullivan Twn, ME, 04664, USA</cmt>
-    <desc>7 Manor Ln
-Sullivan Twn, ME, 04664, USA</desc>
-    <sym>Flag, Blue</sym>
+  <bounds minlat="44.380856138" minlon="-68.195466539" maxlat="44.520120621" maxlon="-68.031334877"/>
+  <wpt lat="44.391460419" lon="-68.031334877">
+    <time>2020-06-08T18:35:29Z</time>
+    <name>Birch Harbor</name>
+    <cmt>Birch Harbor</cmt>
+    <desc>Birch Harbor</desc>
+    <sym>City (Small)</sym>
   </wpt>
-  <wpt lat="44.521450996" lon="-68.204820156">
-    <time>2020-05-22T12:02:28Z</time>
-    <name>Acadia Bay Inn</name>
-    <cmt>Acadia Bay Inn
-12 Miramar Ave
-Sullivan Twn, Maine, 04664, United States
-207-422-0127</cmt>
-    <desc>Acadia Bay Inn
-12 Miramar Ave
-Sullivan Twn, Maine, 04664, United States
-207-422-0127</desc>
-    <sym>Lodging</sym>
+  <wpt lat="44.477913380" lon="-68.038501740">
+    <time>2020-06-08T18:35:58Z</time>
+    <name>Gouldsboro</name>
+    <cmt>Gouldsboro</cmt>
+    <desc>Gouldsboro</desc>
+    <sym>City (Small)</sym>
+  </wpt>
+  <wpt lat="44.380860329" lon="-68.068499565">
+    <time>2020-06-08T11:09:27Z</time>
+    <name>Schoodic Woods Campground</name>
+    <cmt>Schoodic Woods Campground
+Schoodic Loop Rd
+Winter Harbor Twn, Maine, 04693, United States
+207-288-1300</cmt>
+    <desc>Schoodic Woods Campground
+Schoodic Loop Rd
+Winter Harbor Twn, Maine, 04693, United States
+207-288-1300</desc>
+    <sym>Campground</sym>
+  </wpt>
+  <wpt lat="44.520120621" lon="-68.195464611">
+    <time>2019-04-29T21:00:49Z</time>
+    <name>Sullivan Twn</name>
+    <cmt>Sullivan Twn</cmt>
+    <desc>Sullivan Twn</desc>
+    <sym>City (Small)</sym>
   </wpt>
   <rte>
-    <name>7 Manor Ln to Acadia Bay Inn</name>
-    <rtept lat="44.522766536" lon="-68.208928127">
-      <time>2020-05-22T12:02:08Z</time>
-      <name>7 Manor Ln</name>
-      <cmt>7 Manor Ln
-Sullivan Twn, ME, 04664, USA</cmt>
-      <desc>7 Manor Ln
-Sullivan Twn, ME, 04664, USA</desc>
-      <sym>Flag, Blue</sym>
+    <name>Trip to Schoodic Woods Campground - Day 1</name>
+    <rtept lat="44.520120621" lon="-68.195464611">
+      <time>2019-04-29T21:00:49Z</time>
+      <name>Sullivan Twn</name>
+      <cmt>Sullivan Twn</cmt>
+      <desc>Sullivan Twn</desc>
+      <sym>City (Small)</sym>
     </rtept>
-    <rtept lat="44.522766452" lon="-68.208928211">
-      <ele>37.273</ele>
+    <rtept lat="44.520110060" lon="-68.195466539">
+      <ele>45.738</ele>
       <name>0001</name>
-      <cmt>Get on Manor Ln and drive south</cmt>
-      <desc>[PT2S]</desc>
+      <cmt>Get on Us1 and drive east</cmt>
+      <desc>[PT6S]</desc>
       <sym>Waypoint</sym>
     </rtept>
-    <rtept lat="44.522588253" lon="-68.208982944">
-      <ele>37.160</ele>
+    <rtept lat="44.519991875" lon="-68.194198608">
+      <ele>45.563</ele>
       <name>0002</name>
-      <cmt>Turn left onto Us1</cmt>
-      <desc>[PT1M27S]</desc>
+      <desc>[PT23S]</desc>
       <sym>Waypoint</sym>
     </rtept>
-    <rtept lat="44.521901608" lon="-68.204090595">
-      <ele>40.863</ele>
+    <rtept lat="44.518661499" lon="-68.190057278">
+      <ele>44.266</ele>
       <name>0003</name>
-      <cmt>Turn right onto Miramar Ave</cmt>
-      <desc>[PT54S]</desc>
+      <desc>[PT2M3S]</desc>
       <sym>Waypoint</sym>
     </rtept>
-    <rtept lat="44.521506736" lon="-68.204822838">
-      <ele>40.180</ele>
+    <rtept lat="44.509477615" lon="-68.162934780">
+      <ele>28.781</ele>
       <name>0004</name>
-      <cmt>0004</cmt>
+      <desc>[PT1M28S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.498791695" lon="-68.146262169">
+      <ele>26.887</ele>
+      <name>0005</name>
+      <desc>[PT1M21S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.487698078" lon="-68.126349449">
+      <ele>20.605</ele>
+      <name>0006</name>
+      <desc>[PT1M52S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.473836422" lon="-68.097617626">
+      <ele>38.840</ele>
+      <name>0007</name>
+      <cmt>Turn right onto S Gouldsboro Rd</cmt>
+      <desc>[PT3M4S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.459760189" lon="-68.103024960">
+      <ele>34.777</ele>
+      <name>0008</name>
+      <desc>[PT2M12S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.440083504" lon="-68.112123013">
+      <ele>38.371</ele>
+      <name>0009</name>
+      <desc>[PT3S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.439697266" lon="-68.112144470">
+      <ele>38.293</ele>
+      <name>0010</name>
+      <desc>[PT1M29S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.427831173" lon="-68.107531071">
+      <ele>36.547</ele>
+      <name>0011</name>
+      <desc>[PT1M11S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.417660236" lon="-68.096179962">
+      <ele>24.645</ele>
+      <name>0012</name>
+      <desc>[PT1M3S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.407660961" lon="-68.088026047">
+      <ele>15.426</ele>
+      <name>0013</name>
+      <desc>[PT49S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.400794506" lon="-68.086137772">
+      <ele>11.945</ele>
+      <name>0014</name>
+      <desc>[PT1M1S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.394829273" lon="-68.084120750">
+      <ele>9.000</ele>
+      <name>0015</name>
+      <cmt>Turn left onto Main St</cmt>
+      <desc>[PT1M35S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.395301342" lon="-68.077855110">
+      <ele>15.344</ele>
+      <name>0016</name>
+      <desc>[PT23S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.393928051" lon="-68.073670864">
+      <ele>21.840</ele>
+      <name>0017</name>
+      <cmt>Turn right onto Moore Rd</cmt>
+      <desc>[PT1M37S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.380856138" lon="-68.068539295">
+      <ele>41.480</ele>
+      <name>0018</name>
+      <desc>[PT0S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.380860329" lon="-68.068499565">
+      <time>2020-06-08T11:09:27Z</time>
+      <name>Schoodic Woods Campground</name>
+      <cmt>Schoodic Woods Campground
+Schoodic Loop Rd
+Winter Harbor Twn, Maine, 04693, United States
+207-288-1300</cmt>
+      <desc>Schoodic Woods Campground
+Schoodic Loop Rd
+Winter Harbor Twn, Maine, 04693, United States
+207-288-1300</desc>
+      <sym>Campground</sym>
+    </rtept>
+    <rtept lat="44.380856138" lon="-68.068539295">
+      <ele>41.480</ele>
+      <name>0019</name>
+      <cmt>Get on Moore Rd and drive north</cmt>
+      <desc>[PT1M16S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.393928051" lon="-68.073670864">
+      <ele>21.840</ele>
+      <name>0020</name>
+      <cmt>Turn right onto Birch Harbor Rd</cmt>
+      <desc>[PT1M13S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.393627644" lon="-68.070151806">
+      <ele>29.652</ele>
+      <name>0021</name>
+      <desc>[PT1M39S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.390752316" lon="-68.045368195">
+      <ele>29.453</ele>
+      <name>0022</name>
+      <desc>[PT0S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.390752316" lon="-68.045368195">
+      <ele>29.453</ele>
+      <name>0023</name>
+      <desc>[PT0S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.390710322" lon="-68.045376912">
+      <time>2020-06-08T18:39:00Z</time>
+      <name>1 Birch Harbor Rd</name>
+      <desc>1 Birch Harbor Rd
+Winter Harbor, ME, 04693, USA</desc>
+      <sym>Flag, Blue</sym>
+    </rtept>
+    <rtept lat="44.390752316" lon="-68.045368195">
+      <ele>29.453</ele>
+      <name>0024</name>
+      <desc>[PT0S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.390752316" lon="-68.045368195">
+      <ele>29.453</ele>
+      <name>0025</name>
+      <desc>[PT6M9S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.393627644" lon="-68.070151806">
+      <ele>29.652</ele>
+      <name>0026</name>
+      <desc>[PT18S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.393928051" lon="-68.073670864">
+      <ele>21.840</ele>
+      <name>0027</name>
+      <desc>[PT31S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.395301342" lon="-68.077855110">
+      <ele>15.344</ele>
+      <name>0028</name>
+      <desc>[PT51S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.394829273" lon="-68.084120750">
+      <ele>9.000</ele>
+      <name>0029</name>
+      <cmt>Turn right onto Newman St</cmt>
+      <desc>[PT1M27S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.400794506" lon="-68.086137772">
+      <ele>11.945</ele>
+      <name>0030</name>
+      <desc>[PT49S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.407660961" lon="-68.088026047">
+      <ele>15.426</ele>
+      <name>0031</name>
+      <desc>[PT1M3S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.417660236" lon="-68.096179962">
+      <ele>24.645</ele>
+      <name>0032</name>
+      <desc>[PT1M11S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.427831173" lon="-68.107531071">
+      <ele>36.547</ele>
+      <name>0033</name>
+      <desc>[PT1M29S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.439697266" lon="-68.112144470">
+      <ele>38.293</ele>
+      <name>0034</name>
+      <desc>[PT3S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.440083504" lon="-68.112123013">
+      <ele>38.371</ele>
+      <name>0035</name>
+      <desc>[PT2M12S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.459760189" lon="-68.103024960">
+      <ele>34.777</ele>
+      <name>0036</name>
+      <desc>[PT2M16S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.473836422" lon="-68.097617626">
+      <ele>38.840</ele>
+      <name>0037</name>
+      <cmt>Turn right onto Us1</cmt>
+      <desc>[PT1M15S]</desc>
+      <sym>Waypoint</sym>
+    </rtept>
+    <rtept lat="44.472048394" lon="-68.095197100">
+      <ele>36.152</ele>
+      <name>0038</name>
       <desc>[PT0S]</desc>
       <sym>Waypoint</sym>
     </rtept>
-    <rtept lat="44.521450996" lon="-68.204820156">
-      <time>2020-05-22T12:02:28Z</time>
-      <name>Acadia Bay Inn</name>
-      <cmt>Acadia Bay Inn
-12 Miramar Ave
-Sullivan Twn, Maine, 04664, United States
-207-422-0127</cmt>
-      <desc>Acadia Bay Inn
-12 Miramar Ave
-Sullivan Twn, Maine, 04664, United States
-207-422-0127</desc>
-      <sym>Lodging</sym>
+    <rtept lat="44.472033978" lon="-68.095214367">
+      <time>2020-06-08T18:39:36Z</time>
+      <name>Post Office-Gouldsboro</name>
+      <desc>Post Office-Gouldsboro
+411 Route 1
+Gouldsboro Twn, Maine, 04607, United States
+207-963-7148</desc>
+      <sym>Post Office</sym>
     </rtept>
   </rte>
 </gpx>

diff --git a/reference/help.txt b/reference/help.txt
index ab2aa7499527831fe3504a1292c74c0cdb802f77..3fdad3b64c4c79bd363e9a35c3ff4758941b1eb7 100644 (file)
--- a/reference/help.txt
+++ b/reference/help.txt
@@ -188,6 +188,7 @@ File Types (-i and -o options):
          bitscategory          Bitmap of categories 
          ver                   Version of gdb file to generate (1..3) 
          via                   (0/1) Drop route points that do not have an equivalent w 
+         dropwpt               (0/1) Don't create waypoints for non-user points 
          roadbook              (0/1) Include major turn points (with description) from  
        garmin_txt            Garmin MapSource - txt (tab delimited)
          date                  Read/Write date format (i.e. yyyy/mm/dd) 

diff --git a/testo.d/gdb.test b/testo.d/gdb.test
index 05aa812b5d571320428afc1f9e06a205b8e2a3c5..dc8f003e516780bee4a3c87275a389b28754b1ad 100644 (file)
--- a/testo.d/gdb.test
+++ b/testo.d/gdb.test
@@ -27,5 +27,5 @@ gpsbabel -i gdb,via -f ${REFERENCE}/gdb-sample-v3.gdb -o gpx -F ${TMPDIR}/gdb-sa
 compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample_v3.gpx
 
 # don't choke if autoroute information is present.
-gpsbabel -i gdb -f ${REFERENCE}/gdb-sample-v3-autoroute.gdb -o gpx -F ${TMPDIR}/gdb-sample-v3-autoroute.gpx
+gpsbabel -i gdb,dropwpt -f ${REFERENCE}/gdb-sample-v3-autoroute.gdb -o gpx -F ${TMPDIR}/gdb-sample-v3-autoroute.gpx
 compare ${REFERENCE}/gdb-sample-v3-autoroute.gpx ${TMPDIR}/gdb-sample-v3-autoroute.gpx

diff --git a/xmldoc/formats/options/gdb-dropwpt.xml b/xmldoc/formats/options/gdb-dropwpt.xml
new file mode 100644 (file)
index 0000000..fc123f1
--- /dev/null
+++ b/xmldoc/formats/options/gdb-dropwpt.xml
@@ -0,0 +1,5 @@
+<para>
+This option instructs GPSBabel to drop hidden (calculated) points from 
+routes when creating waypoints.  These points are not converted to waypoints, but they are converted to route points.
+</para>
+      

diff --git a/xmldoc/formats/options/gdb-roadbook.xml b/xmldoc/formats/options/gdb-roadbook.xml
index 296d7b03f664f3f99ce7f7b1b04cbfe92252fa1b..c1ef6cfe49196fd2896a506bdc10caea28e6fead 100644 (file)
--- a/xmldoc/formats/options/gdb-roadbook.xml
+++ b/xmldoc/formats/options/gdb-roadbook.xml
@@ -1,8 +1,8 @@
 <para>
   If this option is specified, GPSBabel drops all calculated route points, 
   with exception of points with a description (i.e. "Make U-turns until you know where you are.").
-  The priority of this option is higher than of the <option>via</option> option. 
-  A value of 1 or y overwrites the <option>via</option> settings.
+  The priority of this option is higher than of the <option>via</option> and <option>dropwpt</option> options. 
+  A value of 1 or y overwrites the <option>via</option> and <option>dropwpt</option> settings.
 </para>
 <example id="gdb_roadbook_option">
   <title>Using gdb option <option>roadbook</option> to create simple html roadbook</title>

diff --git a/xmldoc/formats/options/gdb-via.xml b/xmldoc/formats/options/gdb-via.xml
index 0df42530c4c1ac9503a2d082d6616a03439f4c0a..ce782b56a51532b78e3e95011484b14335a86cdb 100644 (file)
--- a/xmldoc/formats/options/gdb-via.xml
+++ b/xmldoc/formats/options/gdb-via.xml
@@ -1,5 +1,5 @@
 <para>
 This option instructs GPSBabel to drop hidden (calculated) points from 
-routes.
+routes.  These points are not converted to waypoints or route points.
 </para>